30defc87a6fa46bdbf857a802228d5d193ad9cee,tests/junit/org/jgroups/protocols/GMS_MergeTest.java,GMS_MergeTest,testConcurrentMergeMultiplePartitions,#,135

Before Change




            System.out.println("\n==== injecting merge event into A, C, E and G concurrently ====");
            injectMergeEvent(channels, "G", "A", "C", "E", "G");
            injectMergeEvent(channels, "E", "A", "C", "E", "G");
            injectMergeEvent(channels, "A", "A", "C", "E", "G");
            injectMergeEvent(channels, "C", "A", "C", "E", "G");

            for(int i=0; i < 20; i++) {
                System.out.print(".");
                if(allChannelsHaveViewOf(channels, 8))
                    break;
                Util.sleep(1000);
            }
            System.out.println("\n");
            print(channels);

After Change


            checkViews(channels, "G", "G", "H");
            checkViews(channels, "H", "G", "H");

            long end_time=System.currentTimeMillis() + 30000;
            do {
                System.out.println("\n==== injecting merge event into A, C, E and G concurrently ====");
                injectMergeEvent(channels, "G", "A", "C", "E", "G");
                injectMergeEvent(channels, "E", "A", "C", "E", "G");
                injectMergeEvent(channels, "A", "A", "C", "E", "G");
                injectMergeEvent(channels, "C", "A", "C", "E", "G");
                Util.sleep(1000);
                if(allChannelsHaveViewOf(channels, 8))
                    break;
            }
            while(end_time > System.currentTimeMillis());

            print(channels);
            assertAllChannelsHaveViewOf(channels, 8);